Merge from trunk.
authorStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 18:37:42 +0000 (20:37 +0200)
committerStephen Berman <stephen.berman@gmx.net>
Fri, 21 Jun 2013 18:37:42 +0000 (20:37 +0200)
commit8d0dd1b2857935693291b64726c1415559150070
tree18724f91e4db7ee82dec79610381d4049146dc5a
parentf2a5be8ebe8497ef69af692674947b2f11aca548
parent7c5c432ad7d4dee6b31b360231c7e69b6697f27d
Merge from trunk.